Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ice9777b662ddac09a43811946eb4312e08add8fc
Change-Id: Id0fbbf28c2ba8798223e2a8793ed2bb55cd5969f