[automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "Register ART Service...

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

am skip reason: subject contains skip directive

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

Change-Id: I975a0aed254b5e1b3819e60dbcfdb48dce78f49d