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

Change-Id: Ib9b53f97f09dc31563ea53d760067027ac2dde67