am 05e4e78d: am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev

* commit '05e4e78d24c5583a44d3f7e52985d028de420723':
  Fix issue #22802782: APR: NPE in package manager with bad intent data