Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I007dfcac3759ed90a91e67614bb952a6986ad6df
Change-Id: Ia168eb8efa3e22f6cad3b59c4672a4f1fe6324ec