Merge "[automerger skipped] Test tethering log dump am: 66b9a4a3 -s ours am: a75b21e0 -s ours" into rvc-d1-dev-plus-aosp