Merge "Snap for 7475547 from fb51977303a3f6cb71fcfdef4c62d654638188f6 to rvc-platform-release am: beef84f5b3" into android11-gsi