Merge "Installd: Add explicit test configurations" am: 375da13a48 am: b9814060bb
am: 5fc62f9434

Change-Id: I833460925aa83014ec788bbfd43f06393955f0f2