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

Change-Id: Ie0ae65191b0588d2021e9683e50466e3040555ec