[automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-dev am: 4a998888 -s ours am: 6a40747f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629766

Change-Id: Id0041c2d3489487723d409a63d3e837fc0f20add