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