Merge "Fix test failure on Android TV due to built in ethernet interface" into main