Merge changes Ife1279ca,Ib1eb78c4 into tm-dev am: 8c0f73cb35

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

Change-Id: I6e4020939e26564268d5b3807f890b198117b110
tree: b642cb028fd6fff90fdf917a286d885a2a0c45ec
  1. nearby/