Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
am: 0bde6dcb18

Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d