Implement new-ER ChaOS sidebar / Add ChaOS labs

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/app_sidebar.xml
	packages/SystemUI/res/layout/notification_shortcut_item.xml
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/res/values/custom_dimens.xml
	packages/SystemUI/res/values/custom_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/AppSidebar.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/ose_dimens.xml
	packages/SystemUI/res/values/ose_styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Ie36a07fbbf7edf67782fa3be879ee77d1e86c0d8