[automerger skipped] Move service initialization am: 239251c1 -s ours am:...

[automerger skipped] Move service initialization am: 239251c1 -s ours am: 66977a7c -s ours am: 1854cff8 -s ours am: 8c0bf7b8 -s ours am: 06a31da8 -s ours

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

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



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