Merge Android 12 Bug: 202323961 Merged-In: I41164ccc5c7eeb1bbc85b071bb79a3a39ddd6ec6 Change-Id: I2d0e5b3a50b91dd08330ec2fa6a9e0729237a097