Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9
Change-Id: I70318f1ecb3816e445b1c29f0041f03ec67e651a