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

Change-Id: Iba451b4f5ef72ad22445d976eae7f6a6b9eacf4a