This reverts commit fd8f615953.
+ some minor adjustments.
Test: runtest systemui
Change-Id: Ie4349fcfb2aadbbd8826506faa8a6fb1ecd5b589
This reverts commit fd8f615953.
+ some minor adjustments.
Test: runtest systemui
Change-Id: Ie4349fcfb2aadbbd8826506faa8a6fb1ecd5b589