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

Change-Id: Ib56df7b06fe643f5fe30c4101e95045241e3027b