tree 26afc0408a1cd61242f8371b3052bcc3c90f8969
parent d4c9ab94ee08896c889f97cd12166c0702f95c22
parent d2bd668324adc862f1d07fb8c559a8a99df65d15
author Chen Xu <fionaxu@google.com> 1538010597 -0700
committer android-build-merger <android-build-merger@google.com> 1538010597 -0700

[automerger skipped] Merge "new System API for preferred network mode" am: 314dcd2874 am: 4560dbd05a
am: d2bd668324  -s ours

Change-Id: I14536beb5928bd6abb4ddc6a8e0f90b3710a692f