Merge "Fix CompileTimeConstant ErrorProne findings in SystemUI" into tm-qpr-dev am: f8003e57e4

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

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