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

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



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