Merge "DO NOT MERGE Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into klp-dev