Merge "Revert "Remove sdk_version if platform_apis is set"" am: aca9b26c93

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084725

Change-Id: I9feaf75b0219aea85af7c3d02b5bfe415ddb65d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/tests/PackageInstallerSessions/Android.bp

@@ -51,5 +51,6 @@ android_test {
     ],
 
     platform_apis: true,
+    sdk_version: "core_platform",
     test_suites: ["device-tests"],
 }

core/tests/bugreports/Android.bp

@@ -35,6 +35,7 @@ android_test {
         "truth-prebuilt",
     ],
     test_suites: ["general-tests"],
+    sdk_version: "test_current",
     platform_apis: true,
 }
 

core/tests/coretests/Android.bp

@@ -73,6 +73,7 @@ android_test {
     ],
 
     platform_apis: true,
+    sdk_version: "core_platform",
     test_suites: ["device-tests"],
 
     certificate: "platform",

services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp

@@ -25,6 +25,7 @@ package {
 
 android_test_helper_app {
     name: "PackageManagerServiceDeviceSideTests",
+    sdk_version: "test_current",
     srcs: ["src/**/*.kt"],
     libs: [
         "android.test.base",