Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ifbde02097b69fe59cc267d6bca0c55b4d5c82f67
Change-Id: I9a85f0329673749320a15d70b18b937fbda5ac95