Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Id92d548179566319aa08b16c56b4fce88ddcd04d
Change-Id: Ie1b56daea3fe293373499d59b031d414a803c5cc