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

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

Change-Id: I2bf0ff93e5071cb19afeafbcdf221b7fe42a8592
Signed-off-by: Automerger Merge Worker <[email protected]>