Merge "Snap for 8589293 from abca8ff86bf9315cd1e3e51cc94f06c191e3a4ff to sc-v2-platform-release am: 49b85e9356" into android12L-gsi