Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I9a69d12332bf65b73750afa58465d68f2161163e
Change-Id: I379a359858aaae8726ba6ff41a96a1b53e071123