This reverts commit f6bd36df. Reason for revert: This cause a crash in systemui Bug: 113095328 Change-Id: I5e6169f0e86e88d1b2d36d04c436e9990eaffcb0