Merge "Camera3: Add error stream ID for buffer drop errors" into nyc-dev
am: 97a330964b

* commit '97a330964b0548238d75602c74b290bea77a6b55':
  Camera3: Add error stream ID for buffer drop errors