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