Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
am: 32a55b93f7
am: 11c55d019d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755 Change-Id: I9011de13a6f459e62808c2a5827372e43c473307
This commit is contained in: