Merge Android 12 Bug: 202323961 Merged-In: Ieb80ad22c6b1a6e973965eef2062d188742c0c83 Change-Id: I332487b33061626071407a892274b1951c6c2cb7