DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I84ad65b397ac38f30f2a4a8ad8ba384fbb50abdb Change-Id: I4d09c5d6c64a3030e70ce591f1ab10f83bba0f02