Merge "Camera2: Disable AOST for non zsl"