am b488b251: am a5209c2e: Merge "Camera3: Improve resilience to stream failures" into klp-dev

* commit 'b488b25148b8e3814a6c4854e6e8cbea6ea33735':
  Camera3: Improve resilience to stream failures