Merge "Snap for 7642564 from 79cb6bbaf4786ef040e487d3ae7d0f1ce0cbadbf to rvc-platform-release am: c53d859120" into android11-gsi