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

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



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