Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I8d4a1afa2fcf7fbd6cf6629b83226ae5005ed949
Change-Id: I8c09e89170c51fdc444900c36ce6a352c9c39a1f