am a4b50709: am b10178f8: am d640ad2b: Merge "Don\'t use the legacy phone picker" into mnc-dev

* commit 'a4b507097419e5c1ee54cce2cb33b36a5e350e7a':
  Don't use the legacy phone picker