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

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



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