Merge "Snap for 8589293 from 26a7b2d5ec0f753a058d807250ad688caba9251c to sc-v2-platform-release am: aba6e191ff" into android12L-gsi