Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf
am: db91a8fa89  -s ours

Change-Id: I162f2462f5018ecb86b3fdad8ae251bdd1d98346