Merge "Convert IntentResolver data object to IntentFilter for comparison" into rvc-dev am: 302f62ce am: fc4d5c9c Change-Id: I64ae0a62481a11843917acf98b6e9443cf22c9cd