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

Change-Id: Ib32bf8f0d3befb86f1144cc18086e4dc9e687580