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

Change-Id: Id7ca9651a5395a3ef2bf940aa8f5f64e86b911f3