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

Change-Id: I8f66fc1f298dacfc04fe0ad80fc2e54b160b6dcb