Merge "Installd: Temporarily disable selinux check in test" am: b6b0c6042c
am: 696d995c4e

Change-Id: I5bd27c29033c69d32789ee89520041623d760f19