Merge "Move service initialization" into tm-dev am: ac94a2da am: dd7d5fcd am: 94bffae8 am: e8e79e97

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



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