Merge "Remove AndroidFuture from ShortcutService's internal api"