Installd: Fix bad merge
am: 69b93aaa31

Change-Id: Ib71543352a17298bc007591c35b79c3ee62dd0fb