Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c
Change-Id: Ic3e8c89ef9571af2b88516911f0fe1238a2eb847