[automerger skipped] Revert "[nearby] Add disable logic" am: 11234fe8c1 am: fa7f79c589 am: 0dea1740da -s ours

am skip reason: Merged-In Id664a6cba297674d8edeb0af700df1e96baaf70e with SHA-1 4ed63b1873 is already in history

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

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