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

Merge "[automerger skipped] Move service initialization am: 937cc90b -s ours am: ea157264 -s ours am: e00b1837 -s ours am: b05172b1 -s ours am: 796b8b0f -s ours" into tm-qpr-dev-plus-aosp am: db282fe7 -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/+/18589980



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