am cbbd6c83: am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev

* commit 'cbbd6c8354f7323933081b217ce53461d99215c4':
  Camera2/3: Don't trigger AF when in INFINITY focus mode.