Merge remote-tracking branch 'github/cm-11.0' into HEAD

(cherry picked from commit 50816215ddfee3e671eea8e41e700507ff232840)

Conflicts:
	packages/SettingsProvider/res/values/defaults.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
Update the GPS tile in the constructor

Change-Id: I985ba2ab769e67c0d43fc67922fe1174bba195f4
(cherry picked from commit 98cb24b38aa085cbf6e494fa52c0697b7bd463e8)
frameworks: move keyguard wallpaper to system  (1/2)

Change-Id: I0eb1b5578b705c2ade4c0772fa86e09478b9f73e
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 89e4d54db78c0a1fefa92b8227511634bbc970d4)

Conflicts:
	core/res/res/values/cm_strings.xml
	services/java/com/android/server/ThemeService.java
Merge "idmap: Don't log spam "CREATING STRING CACHE"" into cm-11.0
(cherry picked from commit 454492ad88d628c74c60f927faa3285ce5c70dc3)
Merge "Fix a NPE when putting a null-Bundle in an Intent" into cm-11.0
(cherry picked from commit 141a23b5ae88490313cbe221d123e5cf4262629f)