Merge "Added a category for lockscreen settings." into oc-dr1-dev
am: 7cb007c6d3

Change-Id: Ifd60b2b309fe7e251c13844ef5473bad1a73c757