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

Change-Id: I25825ad69614cf06075be1a093d0d1823f9b2887