Merge \"Merge \\\"Make Settings->Apps can handle work apps even work profile...
Merge \"Merge \\\"Make Settings->Apps can handle work apps even work profile not enabled yet\\\" into nyc-dev am: 18c8690b am: 711629a2\" into nyc-mr1-dev-plus-aosp
am: 9e0a9bcc
Change-Id: Ibd25ae85aaeea7515c295bd78fe4bc84ccf2303d