Merge "Wifi use state machine from modules-utils" into stage-aosp-master am: 49d0f6788a am: 053a8ac514 am: d603b64f87

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

Change-Id: Ia6bf8745f0a977afcd500a2873ed83c55a948eb4

core/java/Android.bp

@@ -420,10 +420,7 @@ filegroup {
         "android/util/Rational.java",
         "com/android/internal/util/FastXmlSerializer.java",
         "com/android/internal/util/HexDump.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",
     ],
     visibility: [