Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad am: 784ff552fa am: e9475c7c5a am: 56ccc9ba4b am: b60ab301de
am: ba3a51cc1f

* commit 'ba3a51cc1f4022aa592c055fa92cb6edf2b71cfa':
  Revert "Camera: mark testFocusDistanceControl known failure"