Merge "Skip duplicate USER_SYSTEM start in SystemServiceManager." into tm-qpr-dev am: 6303152e0a

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

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