Merge "[NS01] Add NetworkScore" am: 1a645067e5 am: 8cde8bbe9a

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

Change-Id: I3fede24f8b38222d259f42e86ac27962ca687fb4