Merge "Address API council review comments." into tm-dev am: 12cd916bf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Nearby/+/17168284

Change-Id: I8ba3e9b536a0bc4a6978b66c10a05e5e08d99b69
tree: e21e157c17c0561ac86d11c901bcad132a58b81f
  1. nearby/