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

Change-Id: I528a26bd1e15a80035584a5c60722b2ebc7ed5a0