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

Merge "[automerger skipped] Move service initialization am: 14d7f081 -s ours am: 56822a2c -s ours am: 3132e811 -s ours am: 158da851 -s ours am: 2cab87af -s ours am: 7a9b4413 -s ours" into tm-d1-dev-plus-aosp