Merge "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa -s ours am: 40f9b161e8 -s ours am: df647b5aa2 -s ours" into rvc-qpr-dev-plus-aosp