Installd: Fix bad merge
am: f065032f53

Change-Id: Iad40f585d16aa6bc1fdc96e4bad8aa7e013120b7