Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I267160d5d3bbcd97a38fbaafdbc704ecc4f0a959
Change-Id: I57a8c65c7982f1eac78f5dfe97e02cff8abd1c1e