Merge "Snap for 8589293 from 1973cf2231bac9de269dff46bd42549e9d49324a to sc-v2-platform-release am: c46199fa33" into android12L-gsi