[automerger skipped] Merge "Use InetAddress for...

[automerger skipped] Merge "Use InetAddress for LowPowerStandbyPortDescription" into udc-dev am: 86fb6b2c am: c90e3fb0 -s ours

am skip reason: Merged-In Ib152bf621c006871add8b5e90a380e87a93985ad with SHA-1 f7ad2156 is already in history

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



Change-Id: I86adca837be0d38094b37d6963b03dafd8eed161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>