Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I070e4ef71b381cf1253f50362810c5270f97e9a9
Change-Id: I1b9d120b33b85a55a5c2b122cc92566c1e142404