Merge "Revert "[nearby] Add disable logic"" into udc-mainline-prod am: 5cff79392b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/25484451

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