Merge "Rename ro.device_owner system property"