am cc6579ce: am 04bc296b: am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev

* commit 'cc6579cec042def6e1dfe97a92353b3c12b33cab':
  Update the preferred network type APIs.