Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a
Change-Id: I08874ce0b74b20d356ade7da168a56ffb129ab48