[automerger skipped] Merge "Skip duplicate USER_SYSTEM start in...

[automerger skipped] Merge "Skip duplicate USER_SYSTEM start in SystemServiceManager." into tm-qpr-dev am: 6303152e am: c4caa999 -s ours

am skip reason: Merged-In Ic0af6b030c08995715dd3195801ed271c690ce4a with SHA-1 123aa680 is already in history

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



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