Merge "[automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f9 am: 874fac85 am: 8b3d65dc -s ours" into rvc-qpr-dev-plus-aosp