DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I3d37fee446655b59b6b4837aaf9f8073d49d78db Change-Id: I7bc6909c8967c10e5a53c13ac22d522497c189d4