Merge "callforwarding: Add checking response NPE" am: fdda6f61be

Change-Id: Ie49fb8b5f2b8943ca953cdecb4680db450e26a5a