Merge "DO NOT MERGE Let external activities run when the primary display is...
Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev am: 341cd735
am: 70d12175 -s ours
Change-Id: Ia4359527aac2f0193a46e5395a47e39f184f15f9