Merge "Snap for 6948038 from b46b2e485cb4d3be84da928ff6cd4293fec059a0 to rvc-platform-release am: 035acf1df9" into android11-gsi