Merge "Camera: send disable error code to API1 client" into pi-dev
am: 4fe8f25fa2

Change-Id: I4397885c098e1d4c4da18844d7f5320930d1a2e3