Merge "Use correct key value" into qt-dev

    private static String KEY_ADVANCED_CATEGORY = "app_advanced";

    private static String KEY_BADGE = "badge";

    private static String KEY_APP_LINK = "app_link";

    private static String KEY_BUBBLE = "bubble";

    private static String KEY_BUBBLE = "bubble_link_pref";

    private static String[] LEGACY_NON_ADVANCED_KEYS = {KEY_BADGE, KEY_APP_LINK, KEY_BUBBLE};

    private List<NotificationChannelGroup> mChannelGroupList;