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

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

Change-Id: I49f94fb997e770874e851afaa5266c6fd2ba1396