Merge "Snap for 7316203 from 7bc27565ba3d6810c2932ce914e4b9cb553b430a to rvc-platform-release am: 39d778d9e7" into android11-gsi