Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev
am: 18c8690b7e

Change-Id: I8daa485fcf810c5c5bb40903216f8b989658b5ca