Merge "Fix static lib collision between system_server + framework" am: a6f4bbd418 am: e9c7689391 am: 8496003245

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

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

services/core/Android.bp

@@ -162,7 +162,6 @@ java_library_static {
         "android.hardware.biometrics.fingerprint-V2-java",
         "android.hardware.oemlock-V1.0-java",
         "android.hardware.configstore-V1.1-java",
-        "android.hardware.contexthub-V1.0-java",
         "android.hardware.ir-V1-java",
         "android.hardware.rebootescrow-V1-java",
         "android.hardware.soundtrigger-V2.3-java",