am 98ea7dad: Merge "CtsTestServer: Add support for an alternate redirect route"

* commit '98ea7dad3e195e3b75e45332e2e36174a944c063':
  CtsTestServer: Add support for an alternate redirect route