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

Change-Id: I9591fd0c86d0bd33d5a2e3e4b99e1d57843f8c21