Merge "Merge "Further restrict activity launch on virtual displays" into oc-dev am: 36dbd3d4 am: 6e086877" into oc-dr1-dev-plus-aosp