Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev
am: ce7f9a307d

Change-Id: I7c198f9c4373ebdf77383c93726695c89c8b9e3a