[automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev am: 391eb588cf  -s ours am: 9ab6d35098  -s ours
am: c3812981d4  -s ours

Change-Id: I98b66a083f6400b24dd05ffaa41d70edca7f4de2