NotificationHelper: We shouldn't use logical here, one case is enough no matter the order

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Change-Id: I586e481f5475be3e9bde75f5a943b9d5719c7b59