am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

* commit '1fa5f4b33629a8995f44c56b3feb221ef0122477':
  Reset permissions and app links when clearing app preferences - settings