[automerger skipped] Merge "Traffic descriptor only data profile should be...

[automerger skipped] Merge "Traffic descriptor only data profile should be enabled" am: cf852e7c am: 97cc6023 -s ours

am skip reason: Merged-In Ied26cbba3bde8491bfd6299a2724fc2c5b26c026 with SHA-1 d11b29cf is already in history

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



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