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

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



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