am cf2f19fb: Merge "Fix AE and AWB lock were incorrectly unlocked during autofocus." into ics-mr0

* commit 'cf2f19fb053bfe7f39c552b67ffdfc72119ab2d1':
  Fix AE and AWB lock were incorrectly unlocked during autofocus.