Merge "Installd: Make tests atest-ready"