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

Change-Id: If5d42a173c3639af5a4a26671d9dd20edf17c98e