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

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



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