Merge \\\"Fix that work apps settings page crash after changing work profile...
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 64372056 am: 9feb5016
am: 2b593874
Change-Id: I65b9ecc84c763721ce5c943fdd9a7f682f770da4