Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev