Revert "[conflict] Move service initialization am: 38fe45b539"

This reverts commit 012cace2ee6a5a0f66710e231a8ebc83a6fe5152.

Reason for revert: This CL depends on ag/17823648, which is not merged into qt-qpr1-dev.

Change-Id: I503bcc1e979dd4db941cb7754f63a0dc35ce9682
1 file changed