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

Change-Id: I4422c94dac7fe2b0643abda3fcebdd42eb471594