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