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: 445a314f am: c67eec63 am: 979ad8de

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



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