Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I64350e0f177266b05450dcfda0e97a097643bc49
Change-Id: I3bc48057532fc1aa8e8b4b2ea9dee6e59a297cd3