Merge "Set min_sdk_version to be part of mainline modules" am: 8ffe8082e4 am: b692f53739 am: 74593ce0b4

Change-Id: I954309869fce0d3facdadbfe200f73c86b93ae00