Merge Android 12L Bug: 222710654 Merged-In: Iedf680eec5cc52617d70c78fda694e87f75c9a7b Change-Id: Idfe6182996f4d99c1ac0a90cc0f74af5e458c4cb