Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I251acfcf888ecb90958ac7a100c1bf0645515b47
Change-Id: I20eb1e3007dca6fe6d33e2fb91c16cf04788814e