am 78ee9807: am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev automerge: 2a11473

* commit '78ee9807387e87714c74e6944d538409e0677b74':
  camera2: Make legacy error handling more robust.