Merge Android 12 QPR 3

Bug: 236045730
Merged-In: Ic21d7cf76fa0e3a555bccb54be8860d78ec7d789
Change-Id: I234a25616b9fbc7b5bb99708656820c2060fbdaa