Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760