Merge \"Revert \"LauncherApps should also throw when user is locked\"\" into nyc-mr1-dev
am: 5faa852c57

Change-Id: I85af4d9bd703a02c24a8975aaa2e348e9f4c04fe