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

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