Merge "Skip showing Call Forwarding fail-to-disable dialog" am: 82d504d2a9
am: d05e032c92

Change-Id: I98557a1099651367f48e91718401a8e93dc1ced9