Merge Android 12 Bug: 202323961 Merged-In: I8365f0ce1170d0c85b5c5b80ce8370f5ad629a09 Change-Id: Iab5538e36e768916ee85c37aa5f7b665273e11d0