Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Id2399a00662a8aca2e567b2a213fb361c2df109d
Change-Id: I504fe9bd14c9814227fa09809926fa4c5d551c5e