Merge "Address API Council review comments." into tm-dev am: c47b8adb5d

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

Change-Id: Iab00a0fdd9ce3bd81d778da998207459e829f6f1