Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Id10904a7d2efd449cca404f3b94707259362b815
Change-Id: I2eb519d88d472786b341badfb84978ee10675ecd