am 98b483d1: am 40b711ce: Merge "Ensuring that we update the calling uid/package when updating a task\'s original intent. (Bug 16676636)" into lmp-dev

* commit '98b483d1c66f06e2a0e9ebdc3d72510d45158551':
  Ensuring that we update the calling uid/package when updating a task's original intent. (Bug 16676636)