am 084a716d: am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev

* commit '084a716daead0fbb4912ecfc4d44fba28673fd29':
  Mute correct user from device policy manager.