Merge "Do not stop lock task if it is starting background user" into oc-dev
am: 343715b1c1

Change-Id: Icf08aa23cca59f81f8dc3ca7c5f285e23953bb2b