Installd: Fix bad merge am: f065032f53
am: 7feaca4a1c

Change-Id: I7bee9623bec05421d5ad161e9d5ecb2d22ed2bf5