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

Change-Id: I23baf607b5cd13f122ddccaba455e85a04f3422c