Merge "Snap for 8589293 from d9510ee38154d70d052c902d38675abe8762415c to sc-v2-platform-release am: 757971fdc1" into android12L-gsi