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

* commit 'a009be85966924e84f8ee2baa788cd9b903b0ded':
  Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366