Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev