Merge "Add a null home activity to Shell.apk" am: fd2ba540df am: 24f93a2b48

Change-Id: Id4d552ba51e96c13c2e1b958d96ce119155161d4