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

Change-Id: I8401cd5f63d555136463d8d9ffe62d83b685c18c