Merge branch 'davidtruong-showBadge-update' into MOB-3970-NEW-SetShowBadge

# Conflicts:
#	iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationHelper.java

Author: Ayyanchira

iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationHelper.java

@@ -278,7 +278,7 @@ private void removeUnusedChannel(Context context) {
 
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O
                     && mNotificationManager != null) {
-                String channelIdToDelete = isNotificationBadgingEnabled(context) ? context.getPackageName() + NO_BADGE : context.getPackageName();
+                String channelIdToDelete = getOldChannelId(context);
                 NotificationChannel unusedChannel = mNotificationManager.getNotificationChannel(channelIdToDelete);
                 if (unusedChannel != null) {
                     for (StatusBarNotification activeNotification : mNotificationManager.getActiveNotifications()) {
@@ -316,6 +316,14 @@ private static boolean isNotificationBadgingEnabled(Context context) {
         }
 
         private String getChannelId(Context context) {
+            getChannelIdName(context, !isNotificationBadgingEnabled(context))
+        }
+        
+        private String getOldChannelId(Context context) {
+            getChannelIdName(context, isNotificationBadgingEnabled(context))
+        }
+        
+        private String getChannelIdName(Context context, boolean badgingEnabled) {
             String channelId = context.getPackageName();
             if (!isNotificationBadgingEnabled(context)) {
                 channelId = channelId + NO_BADGE;