Merge "Revert "Add a null home activity to Shell.apk"" into rvc-dev am: 6351c72746 am: e3d4b1b779

Change-Id: I370dcf83265a815fbc46351fefbbb79d651e924c