Merge "Snap for 8589293 from b0c01ef19ec31af2ea0179511694124df94257e0 to sc-v2-platform-release am: 6f70ea6f31" into android12L-gsi