Merge "Set min_sdk_version to be part of mainline modules" am: 85d76c04ae am: 5410eff757 am: c5bdfbdf70 am: 8fc035ccd4

Change-Id: Iac12d744020ad10057ac27dc60e36cb89b541631