DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I08664a55a4d56769636ca099d82750db4ea57de9 Change-Id: I7b36430a78e3eec6eaf47149da1b4b086bcb8ebb