Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0e6

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

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