Merge "Camera: Do not signal AutoConditionLock if acquisition times out" into nyc-dev
am: bb6ac18

* commit 'bb6ac1823f7a3d74fbfac841dc74da556f05d2e7':
  Camera: Do not signal AutoConditionLock if acquisition times out

Change-Id: Id82748484941cfee19f989a953fc871f50239180