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

Change-Id: I57c52b7c92d499f79b3c7e41a2035031fa35932f