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

Change-Id: I2690d3d5ebceec07292989976bd1d3976cfaf82f