DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I16c80978f017437dc34980bca697f4ca863e6986 Change-Id: I18103dc1c15294a9758a69f47f64f86d746131bf