Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I7ff50e6a4911268b8b104f5b12cc1a4bfd729d2e
Change-Id: I13888ce527df531e3aa8936e1fe5b69c13f4d5ea