Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b

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

Change-Id: I94875309418fe10f9c094509710aacb19bfb127c