[automerger] Merge "CDD: Relax CDD for activity switching." into nougat-mr1-dev am: 5e7d7dcda6  -s ours am: 7bfc736584 am: 5dfae621eb am: 51be84bdd1 am: 6bccd52aa4 am: 7fb732d0fa
am: 4fbe5aa3d9

Change-Id: Ie9415c13f78fa47eb91a76cab5b5bae5861cbc1a