am 06b29188: am 92cb006c: am a4375293: am 393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev

* commit '06b291883ce4f9f485ea11ef1459b0842e4d3fd2':
  Default grants: handle update system packages