Merge "Snap for 8589293 from 999467507f094e9b480c1c2b8da9a09fcd5ae712 to sc-v2-platform-release am: fcbe4eabdf" into android12L-gsi