[automerger skipped] Merge "Fix NPE in NetworkPolicyLogger.networkBlocked()." am: 09de945c74 am: 22223c8c80 am: c907e083a9 am: 9e674f283d -s ours
am skip reason: Merged-In Ibe5340caf6a7f6b1457c9230e34607cf293f39f3 with SHA-1 9b986eba14 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977008
Change-Id: I7ecda4c3ba2cd1b2ca258a5cd3bc616232975e32
This commit is contained in: