[SQUASHED] Lockscreen Notifications (2/2)

Following commits inside (with minor adaptations)
https://github.com/AOSPAL/android_packages_apps_Settings/commit/10ccffd1ca698aa204479d1c935a3ce3fa47edb2
https://github.com/AOSPAL/android_packages_apps_Settings/commit/17c7bcf21b56a8d977b26f62921d58a3db024a98
https://github.com/AOSPAL/android_packages_apps_Settings/commit/db6757742959c983d2a3477c217fe68e870a6969
https://github.com/AOSPAL/android_packages_apps_Settings/commit/8fc910a7d0a3d559b125706ddf4b65b71bada6c1
https://github.com/AOSPAL/android_packages_apps_Settings/commit/a73649abfce893d99ddc902a04d495970c0f117f
https://github.com/AOSPAL/android_packages_apps_Settings/commit/9b8a305b968018ab4b26fd35720a1e98ccd3852c
https://github.com/AOSPAL/android_packages_apps_Settings/commit/cb18eca4bf63833428b4487c54b1bc3b1b96f66b
https://github.com/AOSPAL/android_packages_apps_Settings/commit/b2ff326f86c6641486dc92de9e02c36a727f5040

Change-Id: Ib13c39cb67839bec92a660000eae23bdb7fdfa30

Conflicts:
	res/values/cm_dimens.xml

Conflicts:
	res/values/cm_dimens.xml
	res/values/cm_strings.xml

[SQUASHED] Lockscreen Notifications (2/2)