Revert "remove conf"

This reverts commit 998e186fafe5d17e549717035441c669ad8eac8b.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Ibf93769a2b7c925d93f79b823a39ccaf9ffabe35