Merge "Ensure we do not set seInfoTargetSdkVersion to 0."