Merge "Snap for 7192656 from 06f5b2f2bfccb2e4bcda9fbc3b40bbe0568f87d0 to rvc-platform-release am: fc6feecad5" into android11-gsi