Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02
am: 4684672789

Change-Id: I02d89a8eb5e626d7e6ec2933e178ea52e0a68109