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 am: 8624bcee -s ours

am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 54b125eb is in history

Change-Id: I5a2a841cde61562adead63562ae11824396cc582