Merge "Merge "When app is updated, save the new version code, and update...
Merge "Merge "When app is updated, save the new version code, and update shortcuts with resource based icons." into nyc-dev am: 711ffe62 am: 7497b700" into nyc-mr1-dev-plus-aosp