Merge "Add implicit min-sdk if a test uses a main-dex list."
am: 0613c9464a

Change-Id: I9dc025e980ab1dac2b55fbbf5175717462fe9094