Merge "Snap for 8589293 from d7a9c3eb48fb4ae47029ff01ac17cae7491d2456 to sc-v2-platform-release am: 5d75887b6e" into android12L-gsi