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

Change-Id: I8fc9ed53ec1441411df4a377288e285870815c3a