Merge Android 12 QPR1

Bug: 210511427
Merged-In: I248f642dde56c0dce04496bdc04877566850086a
Change-Id: Ib8161aaeb0dea8cb22ba97127ca6776d7b72cbdd