Merge "Snap for 7316203 from 61b37105fbecbdbd4e1eb64fb45d333edce3e85a to rvc-platform-release am: 04d29a39b7" into android11-gsi