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

Change-Id: Ib643b2c28086079120799c47ffac61a22be7d835