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

        "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"

}