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

Change-Id: I346ebc3d1fd783f2ce7c2a8b5b059450d653ca75