Merge changes I2b50eb83,I439cb5a4 into tm-dev am: 36b15e51dd

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

Change-Id: Ibeed7cd65e903cbd823d6a669df003f044bed61e
tree: 0d9c68fde3027ee7be50870205f6dee85e2c0cb8
  1. nearby/