[automerger skipped] Add stub NearbyService am: e96e7c4de4 am: 830cbbe1f5 am: 915250c8b0 -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: I5144703f7ac92b928fbe26c57724ef0b11e78a33