resolve merge conflicts of 04e04516b4 to stage-aosp-master

am: c1d180cd7b

Change-Id: Ia7d489faec327e0da681b4bbbeb8f0653e5e1b7e

Android.bp

@@ -1689,3 +1689,11 @@ filegroup {
         "core/java/android/annotation/NonNull.java",
     ],
 }
+
+// Creates an index of AIDL methods; used for adding UnsupportedAppUsage
+// annotations to private apis
+aidl_mapping {
+    name: "framework-aidl-mappings",
+    srcs: [":framework-defaults"],
+    output: "framework-aidl-mappings.txt"
+}