DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: Icc82dc7a8fe8540a1a03ec0eb388aae5cdf0d6f5 Change-Id: I1ff586fd10ad58d54ebaf92edf781802d57dcb12