Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Iea8bead9144b7fac276a5e83ad4c3443e8edb9f5
Change-Id: I7f77889a165565277933de1b30eb238494e9e3f9