am 5f22c0b2: am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev

* commit '5f22c0b27ac4bdd51c2726d8ebe1f094b605528a':
  Badge ChooserActivity choices with their app icon for disambig