Merge "Ensure secondary sysui service starts" into udc-qpr-dev am: 53e4fcba am: df5c20bf

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



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