Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ic53532016a6cfa9a2a2e3a575513e5a90cd6729b
Change-Id: I8bcc9d3f3a56f9ce1865b6ab9041ad31760b11e0