Merge changes from topic "presubmit-am-3369b42535704937873a775614fff2c5" into tm-mainline-prod am: bd91cc762a

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

Change-Id: I6cf2f76766bfb581e97963c14574bf4715839cd8