Add support for annotations in module_sdkandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1

Support has been added to SDKs for annotations, update the
prebuilts to contain annotations as well.

- The Android.bp changes in this change were made manually
- The annotation zip files are from build 7815890

Bug: 187397779
Test: m nothing
Merged-In: Ib98efafb8b7f22de39ab172e091c0f8141c3d5b0
Change-Id: Ib98efafb8b7f22de39ab172e091c0f8141c3d5b0

4 files changed, 6 insertions, 0 deletions

diff --git a/current/Android.bp b/current/Android.bp
index 3a5b72d..20a7bb6 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -61,6 +61,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/public/framework-statsd.srcjar"],
         current_api: "sdk_library/public/framework-statsd.txt",
         removed_api: "sdk_library/public/framework-statsd-removed.txt",
+        annotations: "sdk_library/public/framework-statsd_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -68,6 +69,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/system/framework-statsd.srcjar"],
         current_api: "sdk_library/system/framework-statsd.txt",
         removed_api: "sdk_library/system/framework-statsd-removed.txt",
+        annotations: "sdk_library/system/framework-statsd_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -75,6 +77,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/module-lib/framework-statsd.srcjar"],
         current_api: "sdk_library/module-lib/framework-statsd.txt",
         removed_api: "sdk_library/module-lib/framework-statsd-removed.txt",
+        annotations: "sdk_library/module-lib/framework-statsd_annotations.zip",
         sdk_version: "module_current",
     },
 }
@@ -100,6 +103,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/public/framework-statsd.srcjar"],
         current_api: "sdk_library/public/framework-statsd.txt",
         removed_api: "sdk_library/public/framework-statsd-removed.txt",
+        annotations: "sdk_library/public/framework-statsd_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -107,6 +111,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/system/framework-statsd.srcjar"],
         current_api: "sdk_library/system/framework-statsd.txt",
         removed_api: "sdk_library/system/framework-statsd-removed.txt",
+        annotations: "sdk_library/system/framework-statsd_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -114,6 +119,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/module-lib/framework-statsd.srcjar"],
         current_api: "sdk_library/module-lib/framework-statsd.txt",
         removed_api: "sdk_library/module-lib/framework-statsd-removed.txt",
+        annotations: "sdk_library/module-lib/framework-statsd_annotations.zip",
         sdk_version: "module_current",
     },
 }
diff --git a/current/sdk_library/module-lib/framework-statsd_annotations.zip b/current/sdk_library/module-lib/framework-statsd_annotations.zip
new file mode 100644
index 0000000..bfbd02c
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-statsd_annotations.zip
diff --git a/current/sdk_library/public/framework-statsd_annotations.zip b/current/sdk_library/public/framework-statsd_annotations.zip
new file mode 100644
index 0000000..7f3e91d
--- /dev/null
+++ b/current/sdk_library/public/framework-statsd_annotations.zip
diff --git a/current/sdk_library/system/framework-statsd_annotations.zip b/current/sdk_library/system/framework-statsd_annotations.zip
new file mode 100644
index 0000000..bfbd02c
--- /dev/null
+++ b/current/sdk_library/system/framework-statsd_annotations.zip