am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev

* commit '28762e61e2e45a7e30af02c6fa840a065a645b68':
  Keep default permission grants uninstalling a sys package upgrade