[automerger skipped] Merge "Traffic descriptor only data profile should be...

[automerger skipped] Merge "Traffic descriptor only data profile should be enabled" am: 4a609135 am: 9d7622b5 -s ours am: 87d35609 -s ours am: 8590d225 -s ours am: 06754887 -s ours

am skip reason: Merged-In Idb671b67fbf3e9ed0f78654e5276a77fad5463d1 with SHA-1 ded15447 is already in history

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



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