Merge "Snap for 6948038 from 2ecb72a0afb452851de291d117ebf1298622ee48 to rvc-platform-release am: c735946f9a" into android11-gsi