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

Change-Id: If0d03f0a4cb020a4901eaa4f4232214a3b3f909b