[automerger skipped] Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b am: 8d6635abe3 am: 967634c5a0 -s ours

am skip reason: Merged-In I80c8538372659a04145178fcc8e1af98e78e3681 with SHA-1 92b7040714 is already in history

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

Change-Id: Iade625424e0adb34f5ade05bfaade50ba270b7af