Merge Android 12 QPR1

Bug: 210511427
Merged-In: I763fe1f06e96203a0b7b13ea1d94012d12a3850c
Change-Id: I851b5def7d8bab60eded69dc9648abb0c45a36f9