Merge "Camera2: fix focusDistanceControl test" into lmp-dev