Merge "Snap for 6787936 from c2b6a51d2f1e7df8021b67b5725f1edc3adecb8d to rvc-platform-release am: 4d01012f8f" into android11-gsi