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

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

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

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