[automerger skipped] Merge "Skip Route tests that are R-specific on Q" into...

[automerger skipped] Merge "Skip Route tests that are R-specific on Q" into rvc-dev am: 28aa9004 am: 5750e3df am: bb2bfe83 am: fb79dad1 -s ours am: f559d2a3 -s ours

am skip reason: Change-Id Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4 with SHA-1 965be4e3 is in history

Change-Id: I29381ff510f9066089e464892cd04a0f7c05de13