Merge "Snap for 6948038 from 1cb83289d5e3a7672eb7770297f931c506b91f67 to rvc-platform-release am: 74359f58a9" into android11-gsi