Merge "Avoid NetworkPolicyLogger NullPointException" am: ffeb11af1c am: d5e8197824

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

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