Merge "Snap for 7192656 from 1cb525cd201d28e58cbbea6bf991d650634ffd0a to rvc-platform-release am: 749a0b48da" into android11-gsi