Merge "Camera: Advertise AE/AWB locks in case they are supported" into oc-dev
am: 04ecef3188

Change-Id: I2c681f778dbb7bbbc3a4ede5a21fd513d4b6c4c5