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

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

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