Merge Android 12 QPR1

Bug: 210511427
Merged-In: I67a05a55a122341a7c33d3eefdcc436d94e29a15
Change-Id: Ib21e05a2d01084f40234db0b6a67b37c26f29306