Merge "Do not return synthetic launcher activity for completely headless apps" am: 835504011f am: ede2e771f5
am: 125fa919fa

Change-Id: Ia2d681d6539246a9611e72a66d97c8b3eabb59c2