Merge "Merge "Fix testDeviceStateChanges fail." into android13-tests-dev am: 0ca9ebaf15"