Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest"...

Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedc am: 30edac2b am: 2c4ed3c2

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



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