Merge Android 12 QPR 3

Bug: 236045730
Merged-In: Ia6e09648c74410ce5d14dd6b2032e59466034cb5
Change-Id: Ib3c2374b1598b579299cf8fc2f0949f0d5d73ac5