Merge "Restore lost .dm support of adb install-multiple"
am: 29553d2d52

Change-Id: I796a4886b10db69a8c61a02f041a501da60507d9