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: I2679291a6236fd1f3cb8a12a2e6f61bad31adf3e