am 51cb4081: am dc51d744: Merge "Try to get preferred external provider" into mnc-dev
am 51cb4081: am dc51d744: Merge "Try to get preferred external provider" into mnc-dev

* commit '51cb40817163bfa4c3d3fa5dd16caecf1fd54157':
  Try to get preferred external provider

google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt