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