Merge "Resolve API council comments" into tm-dev am: 4919154ed6

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

Change-Id: I733c7ef664d368092d874dcf01f85b3912bc7279
tree: 821a228872a290dc628198d7d3cbaf86f94eeec8
  1. nearby/