Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev