[automerger skipped] Merge "Add TrafficDescriptor to DataProfileInfo" am:...

[automerger skipped] Merge "Add TrafficDescriptor to DataProfileInfo" am: 3d7d0d29 am: f0758775 am: acc901d8 am: 023459a0 -s ours

am skip reason: Merged-In Ic5e5edab9be1087044e1a303735a59a4cef8ee89 with SHA-1 ba427352 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1917437

Change-Id: I092134ff46957d5f9ac1092d3a74d4869621cde3