Merge "Fixed lingering network bitmask not set issue" into tm-dev am:...

Merge "Fixed lingering network bitmask not set issue" into tm-dev am: 1c5f21f0 am: 3a320807 am: b48ecfe2

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



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