base: Fix derp

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

Change-Id: I79e0e44738ad1b32b5f30f2f1223e20711c9b3e4

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/PerformanceProfileTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/ProfileTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuietHoursTile.java
Default Lockscreen Notifications to off