Merge "Fixed tethering allowed when data disabled" am: 8e384586 am: c458c5ec

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



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