am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock...
am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
automerge: a4df9673
* commit 'a4df9673':
[FRP] Remove None and Swipe from screen lock options