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

Change-Id: I703452bc4fc9172bddda93b1e71706065def3053