Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I6c4077c0b40dcd8f975e59dca4f3693820ec4fac
Change-Id: I38858b525ddf81f3a3e38578660dd37d28c383ab