Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am:...

Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am: 094d7bad am: 93864161

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880532



Change-Id: I88e7db1f442c18aada11305ed54f0b5e66636d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>