Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Icbba828c2126d07924013a319a0be1a23ad10698
Change-Id: I0838b384749833c6b2913629aeacc604b3f923b9