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

Change-Id: Iba8192b2bb43d430e28316e57c4673e8ee3d79c2