Fix CHA in the presence of default conflict methods.

We don't want to set single implementation bits for default
conflict methods, as we need to thor ICCE for them.

bug: 112189179
Test: 966-default-conflict
Change-Id: I768f307f1996b775e3942c87cbe388ce22bebf5d
4 files changed