Merge aadb4613450d6957c459a1b24ad5fe3d37b4799e on remote branch

Change-Id: I37d891bb4bfcec8b4f49f018513979d65765deb2
diff --git a/display/config/1.1/Android.bp b/display/config/1.1/Android.bp
index 586b95e..d0ba1d4 100644
--- a/display/config/1.1/Android.bp
+++ b/display/config/1.1/Android.bp
@@ -77,7 +77,7 @@
         "libutils",
         "libcutils",
         "android.hidl.base@1.0",
-        "vendor.display.config@1.0",
+        "vendor.display.config@1.0_vendor",
     ],
     export_shared_lib_headers: [
         "libhidlbase",
@@ -85,6 +85,6 @@
         "libhwbinder",
         "libutils",
         "android.hidl.base@1.0",
-        "vendor.display.config@1.0",
+        "vendor.display.config@1.0_vendor",
     ],
 }