Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: Ibe2cbde12d9064514653a018eba79685a3cfb552
diff --git a/Android.bp b/Android.bp
index 81afdc9..46a4cc9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,7 +15,7 @@
 java_library_static {
     name: "nist-sip",
     srcs: ["java/**/*.java"],
-    no_framework_libs: true,
+    sdk_version: "core_current",
     errorprone: {
         javacflags: [
             "-Xep:MissingOverride:OFF",  // Ignore missing @Override.