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

Change-Id: Ic2c82221f7154fa0edcaf7e0772e06b51d1f8912