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

* commit '96c95ba59658708c3214b93ace4bb2835ac62863':
  Badge ChooserActivity choices with their app icon for disambig