Merge changes from topic "presubmit-am-65ea84478c734095926dac7f99fad577" into tm-mainline-prod am: 3fb698db5d

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

Change-Id: I2b2b9c8bdea080a06dedcf94417436e7f8f35ccc
tree: a74d974ae9de1eb40914c5ab4d5569db45a125d8
  1. nearby/