Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I348aac2cfcf84032e2526d03cc0adc989d3d0153
Change-Id: I3655929e9307512167df285c48f9de934586821e