Merge "Set min_sdk_version to be part of mainline modules" am: 5a9b7c2b74 am: 8a53a5c1f4

Change-Id: I97df91ab4c902e52dbd25131007e96842b95e120