Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I4ebf28bd3432158c7adad924d77c51949513ff85
Change-Id: Ia5ff62e79443b233dfcc6d2d5e405b25cde73503