Merge "Skip Route tests that are R-specific on Q" into rvc-dev am: 28aa900400 am: 5750e3df7e am: bb2bfe83e4

Change-Id: Ibe7d6dfddc323a7641f6c6dbdb6bc09642195bad