Merge "Traffic descriptor only data profile should be enabled" into tm-dev am:...

Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: 2118c1cf am: 8f9c70b2 am: 7f201650

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



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