Merge "Added traffic descriptor for default data profiles" into tm-dev am:...

Merge "Added traffic descriptor for default data profiles" into tm-dev am: 4068926f am: 8ba52ef2 am: 311d5bc9

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



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