Undo changes accidentally committed with another cl

Test: runtest systemui
Change-Id: I4019d0063bc29f4f83433d6b4701cec20747dc4b
2 files changed