[automerger skipped] Merge "Camera: DistortionMapper: Fix to work consistently" am: f53db30222  -s ours
am: 5b8c6e3567  -s ours

Change-Id: Ic2f5085e36018dfba3caa4aa1e067ed5b9617af9