Merge "Snap for 6948038 from 3b47857a13307bde7357d76984361068cfc96ac5 to rvc-platform-release am: 05e3d00d80" into android11-gsi