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

Change-Id: I4363e0a2c2098466eae0a7a25a6b8fdf150e7ccd