Merge "Skip some CtsContentTestCases for non-handheld devices" into rvc-dev