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 am: 150bda8c -s ours

am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6a is already in history

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



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