[automerger skipped] VTS Sensor HAL 2.0: Fix Batch for One Shot sensors
am: 694e6e829a -s ours
am skip reason: change_id Ib2287f6f11502c10d346f5e7216c5f31d585edf9 with SHA1 66d8297210 is in history

Change-Id: Id1b414ffd8c1513f179d84f55f94c43560dcec9c