Merge "Merge "Revert "Do not finish lockscreen for multiple sims."" into...

Merge "Merge "Revert "Do not finish lockscreen for multiple sims."" into udc-qpr-dev am: dacf60fe" into udc-qpr-dev-plus-aosp am: 4226038d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24406387



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