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

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



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