Merge "[automerger skipped] Move service initialization am: caa5a22e -s ours...

Merge "[automerger skipped] Move service initialization am: caa5a22e -s ours am: 2ee5edda -s ours am: 39711c9d -s ours am: 210bab22 -s ours am: e21ea442 -s ours am: 57c64212 -s ours am: cdc28a24 -s ours am: 30f46cc9 -s ours" into tm-qpr-dev-plus-aosp