Merge "Hide notification before tie managed profile lock" into nyc-dev
am: fcc38e6c35

* commit 'fcc38e6c35be0dd68d722b7398cf2fb66c1c0d92':
  Hide notification before tie managed profile lock

Change-Id: I2e4153b22e67a50f237e29883d949b7b827f4ff8