Merge "Camera2: Clean up corner case error handling" into lmp-dev