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

Change-Id: I6f3a7ad712fb73c3ec0983dc4ea8bbd11ae4e56c