am 681f327e: am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread

Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'

* commit '681f327e839a40a4d55d3567af341b9e90f62378':
  Fix retaining of granted permissions when updating of system app.