Merge "Move MultipathPolicyTracker back to framework" am: a2c355cc am: 81925967 am: cecbb25a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I154a34e1fc7247d1b03091daab2d99d69103b9a6

services/core/Android.bp

@@ -219,7 +219,6 @@ filegroup {
         "java/com/android/server/connectivity/KeepaliveTracker.java",
         "java/com/android/server/connectivity/LingerMonitor.java",
         "java/com/android/server/connectivity/MockableSystemProperties.java",
-        "java/com/android/server/connectivity/MultipathPolicyTracker.java",
         "java/com/android/server/connectivity/Nat464Xlat.java",
         "java/com/android/server/connectivity/NetdEventListenerService.java",
         "java/com/android/server/connectivity/NetworkAgentInfo.java",