Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f am: ccda4906 am: 724ca4bd am: 7e3ef5c1

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



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