Merge "Add new MANAGE_SMARTSPACE permission for the cts test"