Merge "[automerger skipped] Revert "[conflict] Move service initialization am:...

Merge "[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b5" am: 8bb5e98e -s ours am: c543f70e -s ours am: aa456df7 -s ours am: b1cf2a0c -s ours am: 718d5a4d -s ours am: e9f7ca4f -s ours am: edfc3fa2 -s ours am: a1012414 -s ours" into tm-d1-dev-plus-aosp am: 9444f60d -s ours

am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b5 is already in history. Merged-In was found from reverted change.

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

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



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