Merge "Snap for 6948038 from 6661f9e0b771a8dbb64402db4c15f0b6f43cd3f2 to rvc-platform-release am: 9f94ba6917" into android11-gsi