Merge "Sensor VTS testBatchingOperation flakiness fix" into oc-dev am: 751953859c
am: b8197386f9

Change-Id: Iad2c8e4004ea92d1d8c3b0483161ea0b8c8cbc11