Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedcd1 am: 30edac2ba5 am: 2c4ed3c22f am: 4a2c423522

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

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