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

Change-Id: Ie5979fd5f8e31f75d64797e8e34eab21f98a1833