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: I30f34f43502ffe10677e1432c4a05dd51a37de7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>