Merge "CtsVerifier: Better skip of dynamic sensor tests" into nyc-dev