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

Change-Id: I4e6e3f437289e85e4dfd0bc421906f6bb80f2fae