[automerger skipped] Merge "Revert isResolvingImsBinding implementation"
am: ae86fa8697  -s ours

Change-Id: Iba4c1c3aef55ecc141251760707d0c02b331b9c3