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

* commit '40666299c3e3ad8a291c1e5ffce5b6a15f1f6362':
  Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366