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 am: d21325bb -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/+/18589711



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