Merge "Net: IPv6/IPv4 will not disaply when hot-plug in Ethernet [1/1]" into main am: 65953636f9 am: 6a3c85e108 am: 38698bebda

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2729801

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