Merge "Merge "Revert "Add a null home activity to Shell.apk"" into rvc-dev am:...
Merge "Merge "Revert "Add a null home activity to Shell.apk"" into rvc-dev am: 6351c727 am: e3d4b1b7 am: 3f953bb4" into rvc-qpr-dev-plus-aosp am: 39e616bf
Change-Id: I3029aea86959ce3e56001ef3a0e358aec58675fc