Merge "Snap for 6948038 from 27d6b58b2ada53dc27c763e6bcd74d4a83d91d10 to rvc-platform-release am: 8a83da623d" into android11-gsi