Merge "Address API review feedback" into tm-dev am: daaabae00d

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

Change-Id: I08bc3437224cb9f50e7c2586247f60f6bea6a364
tree: 3c4c101120dcca59098d66c2f3cfde19df6b8f03
  1. nearby/