DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I64e49b2c1569d65798dd95b8bcd123100e90fe23 Change-Id: Ie7c4ebb6085872177c1f5431c75844402c1d77cb