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

Change-Id: I1c7e8cdc89f5f9e60448053b39d91884c7b17554