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

Change-Id: Iabfdde32b0d067452d78467c788dcd0cbd11998b