Merge "Snap for 7192656 from 3cbdde00f4a967b1b4e06bbdb97d8568c2ca3139 to rvc-platform-release am: 7c963b6038" into android11-gsi