[automerger skipped] Merge "cameraserver: Check for dataspace override during finishConfiguration." am: 074b3f190d am: 02f9bddfdb
am: 2bc4693fed -s ours
am skip reason: change_id I7b29c337d0e217d2eb6a62e2c75ccc550d795e61 with SHA1 7d355db285 is in history

Change-Id: Iaf6c003fe5c99f33fa4d20695a3cddc53803a0ec