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

Change-Id: Ia01be5067febfa2ca46682c595b92d7050ce03a1