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

* commit '7d170797ac844124b013b77cc220ccf115db12b7':
  Mute correct user from device policy manager.