[automerger skipped] Merge "API updates for TrafficDescriptr fields" am:...

[automerger skipped] Merge "API updates for TrafficDescriptr fields" am: c2ccef2e am: a6ce4c80 am: 25b4a133 -s ours am: 482baa3a -s ours

am skip reason: Change-Id I33018ad413875f4fae1497ed5acc8ee50df7c942 with SHA-1 c5a37982 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ff58613b31f118dd4964a5b1bc2017fcc59e375