Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-r1-dev am: effdb89c97
am: 7af073c790

Change-Id: I694a07ef7fcf9873d67dcf46aeba0df76930bebe