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

Change-Id: Ie6a24345003dba711c74de2b1b997307c35b4f20