[automerger skipped] Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-dev am: 039eca1adc -s ours am: 0b1651b87a -s ours
am: 1ea546e32a -s ours
am skip reason: change_id Ib2287f6f11502c10d346f5e7216c5f31d585edf9 with SHA1 694e6e829a is in history

Change-Id: I36cfba7f26a4732966ce03d723fde1826856b151