[automerger skipped] Merge "Camera: Make originalDataSpace be const upon stream creation" am: 23d978886f am: 75655bf222 -s ours am: bfc9b7de34 -s ours

am skip reason: Change-Id I6b59d40ff796d48fe1804b45c189004f1ecc8c18 with SHA-1 2f5010dfa4 is in history

Change-Id: I6201ea5379c28b818d83078129205ff2989639d2