Merge "CDD: Relax CDD for activity switching." into nougat-mr1-dev
am: 5e7d7dcda6  -s ours

Change-Id: I070720c9106a6019f0ca4f07eae64d8757136b59