am ecce05fa: am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1

* commit 'ecce05fac6600d01b5dca1cbf6345837e2840c5a':
  Streamline package-installed handling by the Backup Manager