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

Change-Id: I8800d11d6b137488674f3159941135bce374d3a6