Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: a2a3640aab am: 14865c4e07

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: Ie252014cd9047c27fad3e451b80047493935dc3d