Merge changes I088adcb6,I40289fb4 into tm-dev am: dd91383752

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

Change-Id: I98a938a1ca5823633d8dacb383680bd1838b306f
tree: 52eb9accc850a1f5f64b96f19c5e410674ad8080
  1. nearby/