Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I7f46780be67edf1a38035fe3c9eed9dc886b504b
Change-Id: I68b363d9576d32a2115ad1fdb275d264157e06d1