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

Change-Id: Ie5d9e868416c4ea1dd1657dfc7925452388b5d0d