Merge "Handle failed supplmentary service notifications"
am: 535c0a7a50

Change-Id: I430ed5f38dc5509edde222e66f4aab28fe519a6e