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

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