[automerger skipped] Merge "Revert "Add a null home activity to Shell.apk""...
[automerger skipped] Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f1 am: 2aabf5f7 -s ours am: 4d6ac2e1 -s ours
am skip reason: Change-Id I927b7dae779da25589f2198e0480c0f2a788a7e4 with SHA-1 539298c1 is in history
Change-Id: I8f56c61781e0e9f35e59ed59eb8a79c9ea1c8453