[automerger skipped] Merge "Register ART Service with the System Server" am: c71c3ac9ab am: 1feef50cc1 am: 6033dd2aa0 -s ours
am skip reason: skip tag Change-Id I9734160f1cd4fd9fc363b3af50e27ec8973be557 with SHA-1 09724a755f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582868
Change-Id: If95b4d9401d43f10e69796d3d8c680e37bad34b7
This commit is contained in: