[conflict] Move service initialization am: 38fe45b5

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



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