[2/2] Base: notification drawer: custom clock & calendar shortcut

OmniGears: https://gerrit.omnirom.org/#/c/4810/

PS9:
fix for multi-user

Change-Id: I941cdebde0b9d90c92f83df9e44f40bb4d4cce63

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Change