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