[automerger] 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 am: aab3a41aff am: 98eb42dbf9 am: 5bf7b39db0
am: 11e813b9fa

Change-Id: Ib26b8c75cbc84d1a8e32035b18c742ad0444f750