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

Change-Id: I659ed8c0c0fa6acb0f2d78d3d3f49ed11d53a94d