Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: 3d3db4b676 am: 5caec096e4 am: 34440a8df0

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

Change-Id: I5052a43c5ec7ef1086bb2e096eb8fec9be300fd5