am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev

* commit 'e4ffec210e857c770cf63db8a1644fd04b9f625d':
  Reset permission policy to default when device owner goes away