Merge "Installd: Add more owners" am: ebc7a1e7b1
am: a866288854

Change-Id: I91af7953d50db0bf531972d61a5fea9a20d70f97