Removing non-preferred activity from resolution set should

not disrupt the preferred resolution

We used to show disambiguation whenever the resolution set
was different in any way from the preferred activity's one.
Now we force disambiguation only when the new state isn't
a preference-inclusive subset of the prior state.

Test: manual, various scenarios with installing, uninstalling, reinstalling multiple launcher apps
Bug: 38387746
Bug: 31955881
Change-Id: I60d963127bc2eb75340b47f2b54e9554549a921b