Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I25ba91f2383fcc8bba5bf5f51dd12c2abe555eaa
Change-Id: I67beb74132fb9a3c540039f1f964ee603b429ad0