Add NearbyService am: 17c5caf93e am: 56f293dba5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966440

Change-Id: I4c0cf2ee03d702af1274cb13b4c79b1c20406e39