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: ccda4906 am: 475683bc am: 31884aa5

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



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