Merge "Re-enable SystemUILintCheckerTest" am: 891a1cc9fa am: 989592b7c2 am: 65d0db4ee8

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

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