Merge "Migrate Connectivity modules to use modules-utils" am: 09b947cd02 am: bd83c28744 am: ff3492b4ad am: 5a4b04acb2

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

Change-Id: I0f1945852b34107febd5f80297654a76ab72c51c

core/java/Android.bp

@@ -158,10 +158,7 @@ filegroup {
         "android/util/LocalLog.java",
         // This should be android.util.IndentingPrintWriter, but it's not available in all branches.
         "com/android/internal/util/IndentingPrintWriter.java",
-        "com/android/internal/util/IState.java",
         "com/android/internal/util/MessageUtils.java",
-        "com/android/internal/util/State.java",
-        "com/android/internal/util/StateMachine.java",
         "com/android/internal/util/WakeupMessage.java",
     ],
 }