Merge "Fix NPE by returning empty params." into rvc-dev

        if (params == null) {

            // TODO: This should throw an exception but there are some cases of re-entrant calls

            // in NotificationEntryManager (e.g. b/155324756) that cause removal in update that

            // lead to inflation after the notification is "removed".

            // lead to inflation after the notification is "removed". We return an empty params

            // to avoid any NPEs for now, but we should remove this when all re-entrant calls are

            // fixed.

            Log.wtf(TAG, String.format("Entry does not have any stage parameters. key: %s",

                            entry.getKey()));

            return newStageParams();

        }

        return params;

    }