Merge Android 12 QPR 3

Bug: 236045730
Merged-In: If22bfeab1cc46bc88d337d90859d79000fe294e9
Change-Id: I415bd463ad3d5a3dcb98e8b34a2c0ea69ff8b6c7