[automerger skipped] [conflict] Move service initialization am: 38fe45b5 am: 012cace2 -s ours

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

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



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