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

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

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



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