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