[automerger skipped] [conflict] Move service initialization am: 38fe45b5 am:...

[automerger skipped] [conflict] Move service initialization am: 38fe45b5 am: 012cace2 -s ours am: f3a82a3b -s ours am: b50f345f -s ours am: f03f3fad -s ours am: 692a0808 -s ours am: 61c6c8ba -s ours

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

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



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