Merge "Clear test ethernet data when no longer enabled" am: b8a7c9bb65 am: ce40d8d691

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2052025

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