Merge "Snap for 7316203 from 3b3fac58e1fd6ccdbb7fa0d1b3cd2cbce78aab56 to rvc-platform-release am: 1d6cdf7ac8" into android11-gsi