am d06fa51b: Merge "Make changing white-balance mode always disable AWB lock."
am d06fa51b: Merge "Make changing white-balance mode always disable AWB lock."

* commit 'd06fa51b3ef8bf28c0c7ebdd82ef47f786e10fb8':
  Make changing white-balance mode always disable AWB lock.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base