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

Change-Id: I55074afee4ffb2aab35396339f5e126de2671dd7