Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ic030fa136076837d18226cdc0a4f62bcbac139c5
Change-Id: I2f74ca4f44dceafdc0d680686902e91d844c2ced