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

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



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