am c4e20e9e: Merge change Iae12c7f0 into eclair

Merge commit 'c4e20e9e1ab761a6ec0766ef7cb649acca4fdc5f' into eclair-plus-aosp

* commit 'c4e20e9e1ab761a6ec0766ef7cb649acca4fdc5f':
  Add REQUESTING_PACKAGE_PARAM_KEY.