Merge "Use pending uid state when calculating network blocked state." into udc-dev am: 74240559

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



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