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

Change-Id: Ic4094f7071030006d5f5d9e21135db5160de644c