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

Change-Id: Iff14e4a09a56af852a31dd5328b81984c06d28fe