Merge "Snap for 8589293 from 53c0de9f238ac553b212b7d3c03f660257b04086 to sc-v2-platform-release am: 9627870ef4" into android12L-gsi