Merge "Merge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1 am: 6355cb7afa" into oc-dr1-dev-plus-aosp