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

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



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