Merge Android 12 QPR 3

Bug: 236045730
Merged-In: Iaa97a03bc18f72e3dfb4cc6600cbec8f2cc876e1
Change-Id: I5bc201841262ae3a409a4bb03aade310687681db