Merge "Set min_sdk_version to be part of mainline modules" am: 78335d9eda am: 3575027a37

Change-Id: I3d22355c93ea7304cc6dcdb7443bb0a780fab36b