[automerger skipped] Move service initialization am: d262fa6a -s ours am: 1df64fbf -s ours

am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 937cc90b is already in history

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



Change-Id: I28dfa78ca6f9ba9746f54bda2ba84e6c72aa27d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>