Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f
Settings: Fix VoiceWakeup settings crash

The activity wasn't able to launch because
of this missing entry.

Change-Id: I7a3bee2ce047a27fe16975955b2263aeeb33b8a7
Signed-off-by: Roman Birg <roman@cyngn.com>
Revert "[2/2] Settings: Lockscreen wallpaper"

This reverts commit 2081db16735e8892e9f2ea8d03f688259b9e66bb.
Merge cm 'branch cm-11.0' into dcm-wip