Merge "Remove Slog usage in NetworkState" am: e95af44a65 am: 2025545d5d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14f13eefd5a1649df8eb3b3f77bfda45997b26de