Merge changes from topic "wifi-tests-stable"

* changes:
  FrameworksWifiApiTests: build against core_current
  Allow FrameworksWifiApiTests to be installed on R & S devices

wifi/Android.bp

@@ -147,7 +147,7 @@ java_sdk_library {
 // defaults for tests that need to build against framework-wifi's @hide APIs
 java_defaults {
     name: "framework-wifi-test-defaults",
-    sdk_version: "core_platform", // tests can use @CorePlatformApi's
+    sdk_version: "core_current",
     libs: [
         // order matters: classes in framework-wifi are resolved before framework, meaning
         // @hide APIs in framework-wifi are resolved before @SystemApi stubs in framework

wifi/tests/Android.bp

@@ -20,6 +20,9 @@ android_test {
 
     defaults: ["framework-wifi-test-defaults"],
 
+    min_sdk_version: "30",
+    target_sdk_version: "30",
+
     srcs: ["**/*.java"],
 
     jacoco: {