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

[automerger skipped] Move service initialization am: 937cc90b -s ours am: ea157264 -s ours am: e00b1837 -s ours am: c1d113af -s ours am: 91b7d0a0 -s ours am: 545e270e -s ours

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

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



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