[automerger skipped] Move service initialization am: caa5a22e -s ours am: 2ee5edda -s ours am: 39711c9d -s ours am: 8e73531d -s ours am: eb114e53 -s ours am: 30d6250e -s ours am: 9fbf0e30 -s ours am: 2835cd27 -s ours

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

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



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