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

Merge "[automerger skipped] Move service initialization am: d262fa6a -s ours am: 1df64fbf -s ours am: 8e1f6b81 -s ours am: 90a8fed9 -s ours am: 5f2819a5 -s ours" into tm-d1-dev-plus-aosp am: 97aeac55 -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/+/18589618



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