Merge "[automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 am: 8b3d65dc78 -s ours" into rvc-qpr-dev-plus-aosp