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

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

Change-Id: I300e9e5eb63a80bc65a9189ba89e779daf7e9668