Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-dev