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

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