Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master