Merge "Set min_sdk_version for com.android.extservices" into rvc-dev