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

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

Change-Id: Ia73ce58ca40670868ed6ec6b5032d8ffa881e7ee
tree: bceb09a861fd8e9d02ccadc3e2369c17c44ed9b6
  1. nearby/