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

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

Change-Id: Ibe0fa3b2858ced990d4edbd9c54aeed03263bed8