Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev am: 61dd3c557c
am: 1b75f9b9c5

Change-Id: Iee0d729b83e554e1ab7bbcf469bd3a2c98fbde37