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

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

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