[automerger skipped] Move service initialization am: 937cc90b -s ours am: ea157264 -s ours

am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 239251c1 is already in history

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



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