Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: 3d3db4b676 am: 8b96743bbf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456

Change-Id: I97ce09569f4d53625ebed5427fbd56915a169a9b