Snap for 8604704 from 8e30902c76441d642b41c57fcb6d750482a20350 to tm-release

Change-Id: Ic56b1ef9765f27d2a9ffc8c5fb759036c28a2874
diff --git a/Android.bp b/Android.bp
index 10d62f4..3fa4ea5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,3 +43,33 @@
 
     srcs: ["src/**/*.java"],
 }
+
+filegroup {
+    name: "StorageManager_proguard_flags",
+    srcs: ["proguard.cfg"],
+}
+
+// The sources for StorageManager need to be exposed to StorageManagerGoogle.
+filegroup {
+    name: "StorageManager_srcs",
+    srcs: ["src/**/*.java"],
+}
+
+android_library {
+    name: "StorageManager-res-lib",
+
+    manifest: "AndroidManifest.xml",
+
+    static_libs: [
+        "androidx.appcompat_appcompat",
+        "androidx.preference_preference",
+    ],
+
+    resource_dirs: [
+        "res",
+    ],
+
+    aaptflags: [
+        "--auto-add-overlay",
+    ],
+}