DO NOT MERGE: Revert "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps""

This reverts commit dd3f305bb3111eb91583ced44f5f10d76e409878.

Reason for revert: wrong branch

Change-Id: Ic9b6d17af8e967ec73a9dac141c60e02195a8d19
diff --git a/Android.bp b/Android.bp
index df90606..21054dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -479,7 +479,10 @@
         "media/java/android/media/IMediaHTTPConnection.aidl",
         "media/java/android/media/IMediaHTTPService.aidl",
         "media/java/android/media/IMediaResourceMonitor.aidl",
+        "media/java/android/media/IMediaRoute2Callback.aidl",
+        "media/java/android/media/IMediaRoute2Provider.aidl",
         "media/java/android/media/IMediaRouterClient.aidl",
+        "media/java/android/media/IMediaRouter2ManagerClient.aidl",
         "media/java/android/media/IMediaRouterService.aidl",
         "media/java/android/media/IMediaScannerListener.aidl",
         "media/java/android/media/IMediaScannerService.aidl",
@@ -1832,4 +1835,4 @@
     name: "framework-aidl-mappings",
     srcs: [":framework-defaults"],
     output: "framework-aidl-mappings.txt"
-}
\ No newline at end of file
+}