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