Merge "Clean up SystemService as a preparation to make @SystemApi"