[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests"...

[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0 am: a281783a -s ours am: a5720827 -s ours am: a59d46ec -s ours

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

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



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