Merge "Register NearbyManager in SystemServiceRegistry"