Merge "Snap for 6948038 from 6fb9d523066da6908f54351e3808ba0e02303dbb to rvc-platform-release am: 724457dc67" into android11-gsi