Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I64383356435d2f07a0aff6e7c73035b0df0cbaf1
Change-Id: I2107841366fe7c42ee1f5d762d58b90cbef0067f