Merge "Preserve certain "Nearby devices" implicit grants." into stage-aosp-sc-ts-dev