Merge "Snap for 7316203 from 10176e57913536abe7940960c5189fd4256a72e0 to rvc-platform-release am: b629b3991b" into android11-gsi