Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ic35e0248bb190e564a2a83b224f380b0f74dce50
Change-Id: Ie23ece16b8f0dc138fb79a5ccef629fa18876404