[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into udc-dev-plus-aosp am: 28d79c33 am: 542bc1be am: 732de612 -s ours

am skip reason: Merged-In I333dcc2c10346ce585d1c5e7f16cad113b2b5a95 with SHA-1 eda872bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24699243



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