[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

Change-Id: I8e00c2f4eebe4c7d0cc9da5abb58c61e44bf7682