Merge "cameraserver: Check for dataspace override during finishConfiguration."
am: 074b3f190d

Change-Id: Ia65f5ab82221f331a2963422244193b525f507d5