Merge "Enable FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS on phones and tablets" into oc-dev am: f49152330a
am: 7e8a518266

Change-Id: I701387ec8c656a5cd74a39631a16205a7a3872e2