Merge "Revert "Add a null home activity to Shell.apk"" into rvc-dev am: 6351c727 am: 01b3848a am: 969092b4 am: 5172db52 Change-Id: I277c08af8a290ec41a899d245602104656e37fa5