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

Change-Id: Id219b9dc2c492bbc8024c65c4b5e5244f9c7e412