[automerger skipped] Merge "Fixed tethering allowed when data disabled" am:...

[automerger skipped] Merge "Fixed tethering allowed when data disabled" am: 8e384586 am: c458c5ec am: 48bd5c60 am: 5aaef3d1 -s ours am: e98c6b1d -s ours

am skip reason: Merged-In Ied1f6f0074249720369d1e069aa000ca59e542c8 with SHA-1 514a4731 is already in history

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



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