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