Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
am: 99df649aa4

* commit '99df649aa4907d9f9c6fe4bdf4acb517003f97f2':
  Do not tie managed profile synchronously in onUnlockUser()

Change-Id: I2d67bf4dc5f7421fef104db4ad25f5bb8bfa4e7d