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

Change-Id: Ie09922f02db351699b2c39b812996f131e71f404