Merge "[automerger skipped] Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot...

Merge "[automerger skipped] Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-dev am: 039eca1a -s ours am: 0b1651b8 -s ours am: 090667aa -s ours
am: bc0d6013 -s ours
am skip reason: change_id Ib2287f6f11502c10d346f5e7216c5f31d585edf9 with SHA1 694e6e82 is in history

Change-Id: Ic5b0e53b020e4497920fdc9d07735c03158c5948