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

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



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