Move nearby apex to tethering

Nearby will be merged together with the tethering/connectivity APEX, so
that module maintenance efforts can be reduced, and the two codebases
can evolve the interfaces that they expose to each other over time.

Bug: 189355156
Test: m
Change-Id: I51ba3fe8bee34fa226fa5ed31ff9f87ee61fdd63
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 68dc910..657be55 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -61,7 +61,6 @@
     com.android.media \
     com.android.media.swcodec \
     com.android.mediaprovider \
-    com.android.nearby \
     com.android.os.statsd \
     com.android.permission \
     com.android.resolv \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 186d4ff..7bdcfed 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -57,7 +57,6 @@
     com.android.ipsec:android.net.ipsec.ike \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \
-    com.android.nearby:framework-nearby \
     com.android.os.statsd:framework-statsd \
     com.android.permission:framework-permission \
     com.android.permission:framework-permission-s \