Merge "Snap for 7316203 from cd8739df84c88dc7528b7baf2c0a13a684cf162f to rvc-platform-release am: 45b170c87d" into android11-gsi