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

Change-Id: Id6470f4a31469da02a8b3d4b4b258e863a9bb234