Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567917

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