Merge "Snap for 7316203 from 05cfb799bec48741ec9dd81a8b90784e96654b69 to rvc-platform-release am: 54024d0d7a" into android11-gsi