Merge Android 12 Bug: 202323961 Merged-In: I1fb6886e1a16a3df9397ef6a4e6dab7bbf838487 Change-Id: Ia98747c621363e0c48935d9c56e203a4fa83a092