Merge "Snap for 8589293 from 46fd211d0ede18f54fd36ccd79370643554d959d to sc-v2-platform-release am: 6abc9a63c0" into android12L-gsi