Merge Android 12 QPR1

Bug: 210511427
Merged-In: I17688436501ef743e1c322453dfeedddf796bba7
Change-Id: Ic1abc0667de54aae268984cc95600ef8a8c415ac