Merge "Revert "vib example client on product"" am: e829d02013 am: 410b8675b4 am: 36e54cd096

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2386052

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

vibrator/aidl/default/example_vendor_java_client/Android.bp

@@ -10,8 +10,7 @@ package {
 cc_library {
     name: "libexample_vib_getter",
     srcs: ["getter.cpp"],
-    product_available: true,
-    vendor_available: true,
+    vendor: true,
     shared_libs: [
         "liblog",
         "libbinder_ndk",
@@ -27,21 +26,6 @@ android_app {
     vendor: true,
     static_libs: ["android.hardware.vibrator-V1-java"],
     jni_libs: ["libexample_vib_getter"],
-    use_embedded_native_libs: true,
-    jarjar_rules: "jarjar.txt",
-    stl: "c++_shared",
-    srcs: ["example/vib/MyActivity.java"],
-    sdk_version: "system_current",
-    visibility: [":__subpackages__"],
-}
-
-android_app {
-    name: "ExampleVibratorJavaProductClient",
-    privileged: true,
-    product_specific: true,
-    static_libs: ["android.hardware.vibrator-V1-java"],
-    jni_libs: ["libexample_vib_getter"],
-    use_embedded_native_libs: true,
     jarjar_rules: "jarjar.txt",
     stl: "c++_shared",
     srcs: ["example/vib/MyActivity.java"],