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