Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I35e0117d296d24ebdd5384365e1fc48b61584c51
Change-Id: I9f89f4d181bf4a9f8b8c026ca6b029ed399f19ac