Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I0c371ece4330a867b5717be0ac4670aefff6736d
Change-Id: I58eaa483c363f2664552fdfc3d3b92215b12db22