Fix recent derps (1/2)

Change-Id: I77f388ecbb4015a4d5870b2b503e4be9ceed2894
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>

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