Merge "Revert "Set min_sdk_version to be part of mainline modules"" am: ccd13f6c52

Change-Id: I974f4241cb77319314347ae68e8551f1f40d6fa8