[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

Change-Id: I0c8219ee734d9116740152294c78e964ceccc7a1