Backup / restore additional lock screen settings

Bug: 22630260
Test: manual :-(

Change-Id: I5c7f3c3a73398cdb14568fb3fcff9410afcef660
3 files changed