Merge remote-tracking branch 'slim/lp5.0' into lp

Conflicts:
	src/com/android/settings/broken/QsSettings.java
Merge branch 'lp' of https://github.com/BrokenOs/packages_apps_Settings into lp