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

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

Change-Id: I7e30b60b104635ed865789ef9b88db1ba82a49d1