[automerger skipped] Add NearbyService am: 17c5caf9 am: 56f293db am:...

[automerger skipped] Add NearbyService am: 17c5caf9 am: 56f293db am: 54018f78 am: b56bb8fa -s ours

am skip reason: Merged-In I399cdba08846a3eca1d7cd9378607b30fa8fd72d with SHA-1 97e88eea is already in history

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

Change-Id: I4abe7e9e7718a3c0f6e6793672f6f84471e94a19