Merge "Merge "Fix testDeviceStateChanges fail." into android13-tests-dev am: 0ca9ebaf15" am: 4141009313 am: be96cbe653 am: 19fbc4a036 am: 3f1249c7d5 am: c50bd33da2

Original change: https://android-review.googlesource.com/c/platform/cts/+/2219703

Change-Id: Ic8f456317dd6aa4a0cc51528815a9d2c703330a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>