[automerger skipped] Fix some NPE issue am: cfd23489f7 am: 7afb47d2be -s ours

am skip reason: Merged-In Iadcdea01127bdec134ef091a562c36e81fdc8630 with SHA-1 cfd23489f7 is already in history

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

Change-Id: I8965d2577f9d359d43c889a849a46fa5d76b0c42
tree: 87d4197cd729cde3f8e19cda20b2ac6c69c4ad5d
  1. nearby/