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

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

Change-Id: I72276ea674c64f2b9077a16121500d209066b83b