Merge "Add androidx.annotation_annotation library" am: 9d5066b806

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2501921

Change-Id: I2b46a014c207f3c5d2e7e7bdeda82729b6c93a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

framework-t/Android.bp

@@ -46,6 +46,7 @@ java_defaults {
     libs: [
         "unsupportedappusage",
         "app-compat-annotations",
+        "androidx.annotation_annotation",
     ],
     impl_only_libs: [
         // The build system will use framework-bluetooth module_current stubs, because

nearby/framework/Android.bp

@@ -45,6 +45,7 @@ java_library {
     srcs: [":framework-nearby-java-sources"],
     sdk_version: "module_current",
     libs: [
+        "androidx.annotation_annotation",
         "framework-annotations-lib",
         "framework-bluetooth",
     ],