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: I1958845346d847a14928f8ddc6174709144fe2fd