[automerger skipped] [nearby] Add disable logic am: 164969d600 am: 63d4d8ca91 am: a621e25277 -s ours

am skip reason: Merged-In I24ca7581d60afee484d14f66a411344ce132425a with SHA-1 3f5aea69f9 is already in history

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

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