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

Change-Id: Ib7f330fdeb4a8f7d31d0b862fd3dabd8d30826bf