[automerger skipped] Move service initialization am: 239251c1cd -s ours

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

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

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