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