am 5aa96df6: Merge "Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366" into jb-dev

* commit '5aa96df6bfc931235834b4a02321d911281a6fcc':
  Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366