Merge "[automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 -s ours am: 967f044f -s ours am: 4b544f23 -s ours" into rvc-qpr-dev-plus-aosp