Merge "Merge "Test tethering log dump" am: 7809a5dfa6 am: 61a0857388" into rvc-dev-plus-aosp