DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: Ia71117d0f8cf70fd601ddbed2c14dc990a872f30 Change-Id: I5045ee0ee3acb0f59b5b667bd59b9e1e5be312f2