Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: e99475ac37 am: dd4b948409 am: df84bdfd7a

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

Change-Id: I17a91de613a0f65b2f87f2ec1e9e4f544e09cd09