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

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



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