Merge "Removing ShortcutInfoCompat and directly using ShortcutInfo" into ub-launcher3-qt-dev
am: 67e52822a4

Change-Id: I93741c0de878d130d02edc3ff1ddb90f7468eb1b