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

Change-Id: I538f570acf3056dc18619ed15d7ec3e6455ec19c