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

Change-Id: I368d429c4aa6c8c0a398b877add982ce36a3c76b