Merge Android 12 QPR1

Bug: 210511427
Merged-In: I931120e34f83ca3f667d94d1cf09659908b41463
Change-Id: Ia6b6eae2163eae37fb3d48cf8676eb5c797a83a4