Merge "Make TrafficDescriptor nonnull in DataProfileInfo" am: a2932530f3 am: 5488a5343c

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

Change-Id: I91a09515952cf7fbbcfb4d9a824be0e4a78a7ef1