Merge "Fix NullPointerException in supp service notify handler."
am: 9a7fa0550b

Change-Id: I736f7e85ec2feeb50e3441ffce3a8e1dc08795c8