Merge "Snap for 7192656 from a99ecf70c1cacd609f07a6264d8692f0f9f3b369 to rvc-platform-release am: beadb2e0d3" into android11-gsi