Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev am: 060b87b068
am: 1b3a751d23

Change-Id: I6c04772912639bd28bd6a7831048b34f1f9dbf87