Test: runtest systemui Fixes: 37626598 This reverts commit d1ba5fbb. Change-Id: I12c70b67fafd46ec98b1c1ee28b911e19afbf6e5