Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
am: fa9a904c1f
am: 493da906c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154 Change-Id: I3a617b929dbb5922b0fe5c2ca7d10e11e72afd6a
This commit is contained in: