Merge "Work profile without password shouldn't be locked." into pi-dev
am: 614e26dbcb

Change-Id: Ic1ac6642f65d0dc8442b596aedaf9ed03bd9aaa3