[automerger skipped] Merge "Revert isResolvingImsBinding ITelephony interface" am: 417b7b14bb  -s ours
am: 05fb3806f3  -s ours

Change-Id: I6c8cc5769dca4e4433f387e5c825e83a3db33503