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

Change-Id: I81aae1f7262583456693a50676833bc277eaa985