Merge "Delay restarting SystemUI on debug builds." into tm-qpr-dev am: abc951df am: a5b0c6c7

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



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