Merge changes I5c1008cf,I911616c9

* changes:
  camera2: (legacy) Fixes for CaptureRequestTest#testAeModeAndLock
  camera2: (Legacy) Implement ae compensation step ranges and ae/awb locks