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

Change-Id: Iae9e5ffdd80514e1c43f445d998fe43a05bcd261