DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I143ba83a708f8726891d81101a3c420315a334c6 Change-Id: Id6920c24718e7baa9ac04c49a4a5f13dc50c999b