Merge "Snap for 6948038 from 93f09572c28288d5a1077875610b4d72972d04db to rvc-platform-release am: 1496cde82d" into android11-gsi