[automerger skipped] [nearby] Catches NPE in ChreDiscoveryProvider am: e899d26468 am: ebbfeee740 am: 2647c464f1 -s ours

am skip reason: Merged-In I1ef411aea6db6d0c169aa08c303f4234c77baed9 with SHA-1 5d07eee4c1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871061

Change-Id: I793da88bf421ba9fd11f7986765e9aa104b4e5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>