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

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