Merge "Snap for 7642564 from 4f7dce3471a4cf3d8dfb90e45ed53dd207e149e4 to rvc-platform-release am: ba85f1b74c" into android11-gsi