Merge "Clear the server based parameters before running RoR tests" am: 4e031965e6 am: 6a80c0462f

Original change: https://android-review.googlesource.com/c/platform/cts/+/1653132

Change-Id: Id03932aa5e996557facd8e382d5d2ad27e01369d