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

Change-Id: I58aa77cec332d449ec763681e871a79af27e4597