[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0e6 am: a281783acc -s ours

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

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

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