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

* commit '9546d5a2ec2598849c2faaa6de998887df9b62f3':
  Badge ChooserActivity choices with their app icon for disambig