am bcedde3c: am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1

* commit 'bcedde3cd614e2a241f4c4dad626b840fd9c2424':
  Unlock camera AWB lock only when white-balance is changed.