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

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

Change-Id: Ib1a0e7ffe82ae6cbfc4ac92f579fc03bd4a3902f