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

Change-Id: I5c7c1ffac883ff6f91a745d44a14df8080d83377