Merge "Remove dependencies on the 1-variant fallback" into main am: e56d23c121

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3317680

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

tests/Enable16KbTests/Android.bp

@@ -54,7 +54,7 @@ java_test_host {
         "compatibility-host-util",
         "compatibility-tradefed",
     ],
-    data: [
+    device_common_data: [
         ":test_16kb_app",
     ],
     test_suites: ["device-tests"],