[automerger skipped] Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-dev am: 039eca1adc am: 8b34aa638c -s ours
am: 23f22d8ead -s ours
am skip reason: change_id Ib2287f6f11502c10d346f5e7216c5f31d585edf9 with SHA1 66d8297210 is in history

Change-Id: I62ed647229d9828ea06553ada734f980d6e7ebbe