Merge "Revert "Ensure SystemUI gets restarted lazily."" into tm-qpr-dev am: 68888b39

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



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