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

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

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



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