Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am:...

Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af60576 am: 3d3db4b6

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

Change-Id: Ic3c2425760c856e3462d304de716a1c5ffc92317