Merge "Avoid NetworkPolicyLogger NullPointException" am: ffeb11af1c

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

Change-Id: I1723cccec489ee4dfd400563fc9148520a458eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>