[automerger skipped] VT: ARTPWriter: Supports ipv6 am: a04d8ca7 am:...

[automerger skipped] VT: ARTPWriter: Supports ipv6 am: a04d8ca7 am: e2185b41 am: 97e56ac1 -s ours am: 18b14418 -s ours

am skip reason: Change-Id Ic10d244ffda1ae6e5275929175d3fdef71ce9fe3 with SHA-1 8a953308 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/952485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b5776c54ac61e3ff6d34caaba0e8780d08ebd0e