Merge "Allow system app to find NearbyManager"