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

Change-Id: I563a6b165a8e6d42789653285bee53f6ed9c8106