Merge \"CameraDevice3: Fail stream configuration more gracefully\" into nyc-dev
am: 642c0275dc

Change-Id: I5a6eee36000d2f4f0666abb0189369ba20d8e44d