Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as Flak…

…yTest" into main

services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java

@@ -285,6 +285,7 @@ public void getDeviceStateInfo() throws RemoteException {
         assertEquals(info.currentState, DEFAULT_DEVICE_STATE.getIdentifier());
     }
 
+    @FlakyTest(bugId = 297949293)
     @Test
     public void getDeviceStateInfo_baseStateAndCommittedStateNotSet() throws RemoteException {
         // Create a provider and a service without an initial base state.