Merge "Register ART Service with the System Server" into sc-dev