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

[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: 5b060c23 -s ours am: 8974fef6 -s ours am: a2b313ae -s ours am: 21bc5de8 -s ours am: 1c27bb1f -s ours

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

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



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