am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev

* commit '120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735':
  Do not reset runtime permissions on upgrade