Merge Android 12 QPR 3

Bug: 236045730
Merged-In: Id06010e4a12be1139ac8883c782e882265dce7cd
Change-Id: I517bcd58e6211aacfc9c71c3c5faeba06249716f