Merge "Add TrafficDescriptor to DataProfileInfo" am: 3d7d0d2926 am: f07587752a am: acc901d88c

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

Change-Id: Iffc69cf80eab3f31a5d4f97a8ce4e71e2f187893