am 29a86c26: am 872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit

* commit '29a86c267b890a506c12d1ffadb8db2baaa2e20e':
  Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)