Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Iffbd2ee10ed3485c8060f0b3e36e6730fe48fd2b
Change-Id: I0b367368946f7147acf241c5a88b8f31e4ba7f13