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

Change-Id: I97a7b6eaee05216a3e691d1f1134e7ec72953e6c