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

Change-Id: I8cb8b28c969366e8a5b0a79966040a5300d3113f