Merge "Rename ro.device_owner system property" am: db6650a905

Change-Id: Ia35df5e63121b72cad532f463378a1f5aec16314