[automerger skipped] Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev am: 4cc443ae2e
am: 0418143f6d  -s ours

Change-Id: I64aef176a377eea254cb5e2f3110ee7d70131cd8