am 55b23ac2: (-s ours) Merge "DO NOT MERGE - Don\'t crash uninstalling updates to system apps" into lmp-preview-dev

* commit '55b23ac23d27bbab5c1aa5688e5eb9e13d92e7d3':
  DO NOT MERGE - Don't crash uninstalling updates to system apps