Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad
am: 784ff552fa

* commit '784ff552fa162444317b2ba61ab7a9fb5e9cbfb9':
  Revert "Camera: mark testFocusDistanceControl known failure"