Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I6690b426d1ef779d7468d9dfe18970ed1ad67aa7
Change-Id: I381764348da5c55b33c4b436928f68eac869e7f8