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