Snap for 8564071 from b28279ad6d3c1b739fe284223523bc240cd60f39 to mainline-conscrypt-release

Change-Id: I98127eec212c193606becc97ec96f4d9d2c97e10
diff --git a/Android.bp b/Android.bp
index 5efb5ff..52becb6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,6 +59,7 @@
         "test_com.android.neuralnetworks",
         "//apex_available:platform",
     ],
+    sdk_version: "current",
 }
 
 subdirs = ["eight_bit_int_gemm"]
diff --git a/OWNERS b/OWNERS
index e05da8e..e5412e2 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,2 @@
 miaowang@google.com
+ianhua@google.com