Merge "Camera: Make originalDataSpace be const upon stream creation" am: 23d978886f

Change-Id: I5f522733603779431bc80f220ef4a0d6236896cd