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

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

Change-Id: I004ed51d98a3842fb5760e213055e7686a6ea30a