Merge "Set min_sdk_version to be part of mainline modules" am: ad9387dd8a

Change-Id: I23ad1935effe456c3b5252951b3867b76cb70c97