Merge "Snap for 7097357 from fd15e88faf6290bdfaad9ba0e8e104eb7c1aef9e to rvc-platform-release am: de4a024264" into android11-gsi