Merge "Snap for 6948038 from c526a1ee73e1bb5b79534622383475cb882dd5df to rvc-platform-release am: a48a40d838" into android11-gsi