Merge "Installd: Add explicit test configurations"