Merge "camera2: Fix AF test CTS tests." into lmp-dev