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

Change-Id: I05f6cd0254f071fe2c6e9b76bddeabb2b1177e73