Merge "Move service initialization" into tm-dev am: ac94a2da am: a6db0352

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



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