Merge "API updates for TrafficDescriptr fields" am: c2ccef2e2a am: a6ce4c80e8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icae1969e60d61ed92fcc1caff55eab0ad5b8ff8a