[automerger skipped] Merge "Register ART Service with the System Server" am:...

[automerger skipped] Merge "Register ART Service with the System Server" am: c71c3ac9 am: 1feef50c am: 6033dd2a -s ours am: 78fe2eda -s ours

am skip reason: skip tag Change-Id I9734160f1cd4fd9fc363b3af50e27ec8973be557 with SHA-1 09724a75 is already in history

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

Change-Id: I180ead78bc65211373b2faff654f2a8aa579ddbc