Apply ChreDiscoveryProvider fix

Change-Id: Id5f984538137df6a4a851ae069ca0c1e1c2b34e8
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: -m
3 files changed