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

Merge "Move service initialization" into tm-dev am: ac94a2da am: a6db0352 am: 15eeeb07 am: 6d2a6fbc

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



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