Only check for badge setting on notification on O+
am: cf18c3c2d1

Change-Id: I0836999832eae7f90e9ee1ad5c823180e1e22ad4