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

* commit '7bda4b9672dbee0c4cdb7b8d57ad266680775b94':
  Keep default permission grants uninstalling a sys package upgrade