Merge "Snap for 6948038 from cd9770d80f941e148e51f841df8ce510b7b9f9d9 to rvc-platform-release am: 7723487c61" into android11-gsi