Merge "Snap for 8671748 from a2d8314ab8a72302aa67ee281f105f73ee51dabf to sc-v2-platform-release am: af5c247766" into android12L-gsi