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