Merge Android 12 Bug: 202323961 Merged-In: Ia961878214b0f572ff197f23ce4d30bffaddee0e Change-Id: Ia2deab591dbbd1152ec6507b8c8614b4cf124cf7