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

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



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