Test: runtest systemui Change-Id: I1cf84a0943092fcfc5428fcfccb4a887a83b294b Fixes: 35205198 Fixes: 36592148 (cherry picked from commit 78187249)