Installd: Fix bad merge am: 69b93aaa31
am: 748a7389ce

Change-Id: I9f5e35fa8c692c730bb3d82f293440b62fdcc9d4