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

Change-Id: I4bedc599e43772996a568290ff5debb4e0f920bf