Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedcd1

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

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