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

Change-Id: I77be28465d8fe8439877859e3e630103efe69c4f