Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 789f3829a0

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

Change-Id: I3882363a6c08372c2f50f209452123b50c7ec4e5