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

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