Fix NPE when addingIncomingCall is called with null extras am: 59a314c44c
am: ab55a05ba1

Change-Id: I050e47be91932037d1b365f316e81af27415610e