am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev

* commit 'ff0c4ab667ca92fed830c98604bfed7884f4f16e':
  CtsVerifier: Camera FOV: cap FOV test to 120 degree