[automerger skipped] Add stub NearbyService am: e96e7c4de4 am: 28ccc57b58 -s ours

am skip reason: Merged-In I7e280495f1eefada0939dad2ce7f47f45885ad66 with SHA-1 d8e74229ec is already in history

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

Change-Id: Ibce4212a19ca7ff6f03c4ac37288f2ac6912c9bd