[2/2] Losckscreen Notifications fixes

- Lockscreen Notifications: fix removal of pocketmode setting
from: https://github.com/AOSPAL/android_packages_apps_Settings/commit/b2ff326f86c6641486dc92de9e02c36a727f5040

Change-Id: Ic371e2b409de9c77c7b33aa1eead14cd0a0df563

Conflicts:
	src/com/android/settings/crom/lsn/LockscreenNotifications.java
[2/2] Settings: Lockscreen notifications: Option to disable dynamic width

Change-Id: I79b76134e9ff29ea5e305129870d6c5517907203

Conflicts:

	res/values/ok_strings.xml

Conflicts:
	res/values/crom_strings.xml
	res/xml/lockscreen_notifications.xml