Merge "Installd: Make tests atest-ready" am: a11d432df3 am: adf456c076
am: fb37d5cccb

Change-Id: I6d2223515deb2b4b5738fbafa92821fe02249637