Merge "Camera: fix Integer comparison" into lollipop-cts-dev
automerge: b51c8ca

* commit 'b51c8ca036769928f5fb043054cb2013a84c9e30':
  Camera: fix Integer comparison