[automerger skipped] Merge "Correct conversion for TrafficDescriptor" am: 6fb35e70 am: 9e3ebad7 am: 236510ce am: 51106ecb -s ours

am skip reason: Merged-In I2b41242c9f1e997ceb26d61b893ecf60ef012051 with SHA-1 c11c6a02 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1938585

Change-Id: I9a084914f4b47add95f59baf5d5ac62e6c7f92fe