Merge "Installd: Add explicit test configurations"
am: 375da13a48

Change-Id: Id5f647f42f1f838415aed7c4319a204f970a3446