Merge "Rename ro.device_owner system property" am: 075c6b9db7

Change-Id: Ib3c2ab64f7e6abad80eb6814cbd508bff6e76393