Merge "Remove black flash when unlocking work profile" into rvc-dev am: ea2808e6 am: ec3c58b5 am: b8badc95 am: 8cf6bd2d Change-Id: Idc9ef1cb6b65af9dece329ac058a4fd249569c19