Code synchronization with the core Resolver

As unbounded Resolver is not available at the moment, this change
just reflects ag/20252644.

Test: smoke test of the Chooser functionality
Test: atest IntentResolverUnitTests
Change-Id: I3048e76427878df17043ce5ee203d1d4ede04466