Merge "Ensure SystemUI gets restarted lazily." into tm-qpr-dev am: 70d49aa91d

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

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