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

Change-Id: I1785c42b09f51d8a7ac72a522b5a9d3fdb83e1f8