Rename dependencies after removing Android.mk versions of car libs

Test: m checkbuild
Change-Id: I519019d2da3b6db1419cdbc051c76957058fa9df
diff --git a/Android.bp b/Android.bp
index 761fdab..a7e129f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,13 +30,13 @@
         "androidx.preference_preference",
         "androidx-constraintlayout_constraintlayout",
         "androidx.test.core",
-        "car-apps-common-bp",
+        "car-apps-common",
         "car-setup-wizard-lib-utils",
         "SettingsLib",
         "android.car.userlib",
         "androidx-constraintlayout_constraintlayout-solver",
         "jsr305",
-        "car-ui-lib-bp",
+        "car-ui-lib",
     ],
 
     certificate: "platform",
@@ -80,13 +80,13 @@
         "androidx.preference_preference",
         "androidx-constraintlayout_constraintlayout",
         "androidx.test.core",
-        "car-apps-common-bp",
+        "car-apps-common",
         "car-setup-wizard-lib-utils",
         "SettingsLib",
         "android.car.userlib",
         "androidx-constraintlayout_constraintlayout-solver",
         "jsr305",
-        "car-ui-lib-bp",
+        "car-ui-lib",
     ],
 
     // Testing only resources must be applied last so they take precedence.