Merge "Fixed lingering network bitmask not set issue" into tm-dev am: 82a7ed91 am: 15170e15

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17675821



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