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

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

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